Display only first page of search results by default and display a total results...

Display only first page of search results by default for each section and
allow clicking on the section header to view all the results for a given
section. This design will allow us to easily move from paging to scrolling
without having to stack multiple scrollbars in a single pane.

Display a total results count next to the section name. This serves as an
indicator that there are more results. The section header pre-lights to
indicate that it can be clicked on.

Make sure we go back to the first page of results when we exit a single
section mode. Make sure we re-instate all result sections if the search
mode is left.

Close the only section search mode on Esc, and only close the search
when Esc is hit again.

diff --git a/js/ui/dash.js b/js/ui/dash.js
index fbbcf389aa6d324cbb05cb13bf466455fc6bebd3..8ef551dc743890c2e194506f7d52a4d7c119b181 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -27,6 +27,9 @@ const DASH_PADDING_SIDE = 14;
 const BACKGROUND_COLOR = new Clutter.Color();
 BACKGROUND_COLOR.from_pixel(0x000000c0);
 
+const PRELIGHT_COLOR = new Clutter.Color();
+PRELIGHT_COLOR.from_pixel(0x4f6fadaa);
+
 const TEXT_COLOR = new Clutter.Color();
 TEXT_COLOR.from_pixel(0x5f5f5fff);
 const BRIGHT_TEXT_COLOR = new Clutter.Color();
@@ -421,6 +424,36 @@ SectionHeader.prototype = {
     }
 }
 
+function SearchSectionHeader(title, onClick) {
+    this._init(title, onClick);
+}
+
+SearchSectionHeader.prototype = {
+    _init : function(title, onClick) {
+        let box = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                padding_top: DASH_SECTION_PADDING,
+                                padding_bottom: DASH_SECTION_PADDING });
+        let titleText = new Clutter.Text({ color: TEXT_COLOR,
+                                           font_name: 'Sans Bold 10px',
+                                           text: title });
+        this.countText = new Clutter.Text({ color: TEXT_COLOR,
+                                           font_name: 'Sans Bold 12px' });
+
+        box.append(titleText, Big.BoxPackFlags.NONE);
+        box.append(this.countText, Big.BoxPackFlags.END);
+
+        let button = new Button.Button(box, PRELIGHT_COLOR, BACKGROUND_COLOR,
+                                       TEXT_COLOR, false, null);
+        button.button.height = box.height;
+        button.button.padding_left = DEFAULT_PADDING;
+        button.button.padding_right = DEFAULT_PADDING;
+
+        button.button.connect('button-release-event', onClick);
+
+        this.actor = button.button;
+    }
+}
+
 function Section(titleString, suppressBrowse) {
     this._init(titleString, suppressBrowse);
 }
@@ -497,7 +530,9 @@ Dash.prototype = {
                 let text = this._searchEntry.getText();
                 text = text.replace(/^\s+/g, "").replace(/\s+$/g, "");
                 this._appSearchResultArea.display.setSearch(text);
+                this._appSearchHeader.countText.text = this._appSearchResultArea.display.getMatchedItemsCount() + "";
                 this._docSearchResultArea.display.setSearch(text);
+                this._docSearchHeader.countText.text = this._docSearchResultArea.display.getMatchedItemsCount() + "";
                 return false;
             }));
         }));
@@ -512,9 +547,12 @@ Dash.prototype = {
             let text = this._searchEntry.getText();
             let symbol = Shell.get_event_key_symbol(e);
             if (symbol == Clutter.Escape) {
-                // Escape will keep clearing things back to the desktop. First, if
-                // we have active text, we remove it.
-                if (text != '')
+                // Escape will keep clearing things back to the desktop.
+                // If we are showing a particular section of search, go back to all sections.
+                if (this._getOnlyAppSearchShown() || this._getOnlyDocSearchShown())
+                    this._showAllSearchSections();
+                // If we have an active search, we remove it.
+                else if (this._searchActive)
                     this._searchEntry.reset();
                 // Next, if we're in one of the "more" modes or showing the details pane, close them
                 else if (this._activePane != null)
@@ -601,21 +639,27 @@ Dash.prototype = {
 
         this._searchResultsSection = new Section(_("SEARCH RESULTS"), true);
 
-        this._searchResultsSection.content.append(new Clutter.Text({ color: TEXT_COLOR,
-                                                                     font_name: 'Sans Bold 10px',
-                                                                     text: _("APPLICATIONS") }),
-                                                  Big.BoxPackFlags.NONE);
-
+        this._appSearchHeader = new SearchSectionHeader(_("APPLICATIONS"),
+                                                        Lang.bind(this,
+                                                                  function () {
+                                                                      this._toggleOnlyAppSearchShown();
+                                                                      return true;
+                                                                  }));
+        this._searchResultsSection.content.append(this._appSearchHeader.actor, Big.BoxPackFlags.NONE);
         this._appSearchResultArea = new ResultArea(AppDisplay.AppDisplay, false);
+        this._appSearchResultArea.controlBox.hide();
         this._searchResultsSection.content.append(this._appSearchResultArea.actor, Big.BoxPackFlags.EXPAND);
         createPaneForDetails(this, this._appSearchResultArea.display);
 
-        this._searchResultsSection.content.append(new Clutter.Text({ color: TEXT_COLOR,
-                                                                     font_name: 'Sans Bold 10px',
-                                                                     text: _("DOCUMENTS") }),
-                                                  Big.BoxPackFlags.NONE);
-
+        this._docSearchHeader = new SearchSectionHeader(_("RECENT DOCUMENTS"),
+                                                        Lang.bind(this,
+                                                                  function () {
+                                                                      this._toggleOnlyDocSearchShown();
+                                                                      return true;
+                                                                  }));
+        this._searchResultsSection.content.append(this._docSearchHeader.actor, Big.BoxPackFlags.NONE);
         this._docSearchResultArea = new ResultArea(DocDisplay.DocDisplay, false);
+        this._docSearchResultArea.controlBox.hide();
         this._searchResultsSection.content.append(this._docSearchResultArea.actor, Big.BoxPackFlags.EXPAND);
         createPaneForDetails(this, this._docSearchResultArea.display);
 
@@ -656,6 +700,7 @@ Dash.prototype = {
 
     _updateDashActors: function() {
         if (!this._searchActive && this._searchResultsSection.actor.visible) {
+            this._showAllSearchSections();
             this._searchResultsSection.actor.hide();
             this._appsSection.actor.show();
             this._placesSection.actor.show();
@@ -666,6 +711,65 @@ Dash.prototype = {
             this._placesSection.actor.hide();
             this._docsSection.actor.hide();
         }
+    },
+
+    _toggleOnlyAppSearchShown: function() {
+        if (this._getOnlyAppSearchShown()) {
+            this._setDocSearchShown(true);
+        } else {
+            this._setDocSearchShown(false);
+        }
+    },
+
+    _toggleOnlyDocSearchShown: function() {
+        if (this._getOnlyDocSearchShown()) {
+            this._setAppSearchShown(true);
+        } else {
+            this._setAppSearchShown(false);
+        }
+    },
+
+    // TODO: the following two functions currently rely on us showing the
+    // section header even if there are no results in that section. We'll need
+    // to change the check if we update that behavior. We'll also need to change
+    // the check if we add more sections to search results.
+    _getOnlyAppSearchShown: function() {
+        return this._searchActive && !this._docSearchHeader.actor.visible;
+    },
+
+    _getOnlyDocSearchShown: function() {
+        return this._searchActive && !this._appSearchHeader.actor.visible;
+    },
+
+    _setAppSearchShown: function(show) {
+        if (show) {
+            this._appSearchHeader.actor.show();
+            this._appSearchResultArea.actor.show()
+            this._docSearchResultArea.display.displayPage(0);
+            this._docSearchResultArea.controlBox.hide();
+        } else {
+            this._appSearchHeader.actor.hide();
+            this._appSearchResultArea.actor.hide()
+            this._docSearchResultArea.controlBox.show();
+        }
+    },
+
+    _setDocSearchShown: function(show) {
+        if (show) {
+            this._docSearchHeader.actor.show();
+            this._docSearchResultArea.actor.show()
+            this._appSearchResultArea.display.displayPage(0);
+            this._appSearchResultArea.controlBox.hide();
+       } else {
+            this._docSearchHeader.actor.hide();
+            this._docSearchResultArea.actor.hide()
+            this._appSearchResultArea.controlBox.show();
+       }
+    },
+
+    _showAllSearchSections: function() {
+        this._setAppSearchShown(true);
+        this._setDocSearchShown(true);
     }
 };
 Signals.addSignalMethods(Dash.prototype);

diff --git a/js/ui/genericDisplay.js b/js/ui/genericDisplay.js
index b874bc9418f71d792b33dd05c6ae46d5670b25e1..60991185f81437b848b51ab6f20406bfa32e8c75 100644 (file)
--- a/js/ui/genericDisplay.js
+++ b/js/ui/genericDisplay.js
@@ -430,6 +430,10 @@ GenericDisplay.prototype = {
         return this._list.displayedCount > 0;
     },
 
+    getMatchedItemsCount: function() {
+        return this._matchedItems.length;
+    },
+
     // Load the initial state
     load: function() {
         this._redisplay(true);
@@ -452,6 +456,11 @@ GenericDisplay.prototype = {
         return item.createDetailsActor();
     },
 
+    // Displays the page specified by the pageNumber argument.
+    displayPage: function(pageNumber) {
+        this._list.page = pageNumber;
+    },
+
     //// Protected methods ////
 
     /*
@@ -680,11 +689,6 @@ GenericDisplay.prototype = {
         }));
     },
 
-    // Displays the page specified by the pageNumber argument.
-    _displayPage: function(pageNumber) {
-        this._list.page = pageNumber;
-    },
-
     /*
      * Updates the display control to reflect the matched items set and the page selected.
      *
@@ -711,7 +715,7 @@ GenericDisplay.prototype = {
                 pageControl.connect('clicked',
                                     Lang.bind(this,
                                               function(o, event) {
-                                                  this._displayPage(pageNumberLocalScope);
+                                                  this.displayPage(pageNumberLocalScope);
                                               }));
             }
         } else {